Changed User to Light::User
Bug & duplication fixes