Cleanup code + adding Global file for constants