Cleaned up minor init errors, variable names