diff --git a/SConstruct b/SConstruct
index 606ad855ea..bfc6f83f1d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -54,10 +54,8 @@ if env['PLATFORM'].startswith('win'):
    env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86'
 elif env['PLATFORM'] == 'posix':
    env.Append(CPPDEFINES = ['NDEBUG'])
-   arch_flags  = ''
-   opt_flags   = '-O2'
-   warn_flags  = '-Wall'
-   env['CCFLAGS'] = '%s %s %s' % (warn_flags, arch_flags, opt_flags)
+   env.Append(CCFLAGS = ['-Wall', '-fno-strict-aliasing'])
+   env.Append(CCFLAGS = ['-O3', '-fomit-frame-pointer', '-march=core2'])
    #env['LINKFLAGS'] = ''
 
 
diff --git a/examples/wsperf/case.cpp b/examples/wsperf/case.cpp
index 1156347606..65d401e974 100644
--- a/examples/wsperf/case.cpp
+++ b/examples/wsperf/case.cpp
@@ -23,4 +23,4 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- */
\ No newline at end of file
+ */
diff --git a/examples/wsperf/case.hpp b/examples/wsperf/case.hpp
index 7b7d7c7779..4926ff74ae 100644
--- a/examples/wsperf/case.hpp
+++ b/examples/wsperf/case.hpp
@@ -316,4 +316,4 @@ typedef boost::shared_ptr<case_handler> case_handler_ptr;
 
 } // namespace wsperf
 
-#endif // WSPERF_CASE_HPP
\ No newline at end of file
+#endif // WSPERF_CASE_HPP
diff --git a/examples/wsperf/generic.cpp b/examples/wsperf/generic.cpp
index 1156347606..65d401e974 100644
--- a/examples/wsperf/generic.cpp
+++ b/examples/wsperf/generic.cpp
@@ -23,4 +23,4 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- */
\ No newline at end of file
+ */
diff --git a/examples/wsperf/generic.hpp b/examples/wsperf/generic.hpp
index 88ab45d4c1..534f3e9773 100644
--- a/examples/wsperf/generic.hpp
+++ b/examples/wsperf/generic.hpp
@@ -158,4 +158,4 @@ private:
 
 } // namespace wsperf
 
-#endif // WSPERF_CASE_GENERIC_HPP
\ No newline at end of file
+#endif // WSPERF_CASE_GENERIC_HPP
diff --git a/examples/wsperf/request.cpp b/examples/wsperf/request.cpp
index 1156347606..65d401e974 100644
--- a/examples/wsperf/request.cpp
+++ b/examples/wsperf/request.cpp
@@ -23,4 +23,4 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- */
\ No newline at end of file
+ */
diff --git a/examples/wsperf/request.hpp b/examples/wsperf/request.hpp
index c9c5815318..f1484cae54 100644
--- a/examples/wsperf/request.hpp
+++ b/examples/wsperf/request.hpp
@@ -188,11 +188,4 @@ void process_requests(request_coordinator* coordinator) {
 
 } // namespace wsperf
 
-
-
-
-
-
-
-
-#endif // WSPERF_REQUEST_HPP
\ No newline at end of file
+#endif // WSPERF_REQUEST_HPP
diff --git a/src/uri.cpp b/src/uri.cpp
index c1cb3151ae..b69ab6bb71 100644
--- a/src/uri.cpp
+++ b/src/uri.cpp
@@ -317,4 +317,4 @@ uint16_t uri::get_port_from_string(const std::string& port) const {
     }
     
     return t_port;
-}
\ No newline at end of file
+}