Cleaned up code.
Code tweak