Cleaned code/presentation