Cleaned up code. v0.0.3