Cleaned up code. Changed configurations