Formatting for Pycharms + small edits for personal use