Code cleanup & fixing prompt