Cleaned up commented code etc.