Added some 'public's
Cleaned white spaces