diff --git a/.bash_profile b/.bash_profile
index 5df9de8..e09edb4 100755
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,7 +1,4 @@
 #!/bin/sh
-# This tells the system what terminal you are using or emulating.
-export TERM="xterm-256color"
-
 # stty (Set TTY) sets up your TTY.  Note, if you have problems with
 # your backspace key, try changing the "erase '^h'" to "erase '^?'".
 # If that still does not help, type stty erase at the shell prompt
@@ -9,55 +6,63 @@ export TERM="xterm-256color"
 stty erase '^?' echoe
 
 # Shell options
-shopt -s completion_strip_exe 	# Strip exe from completion
-shopt -s autocd 				# AutoCD up with '..'
+shopt -s autocd  				# AutoCD up with '..'
+shopt -s completion_strip_exe	# Strip exe from completion
+
+# Ignore list for filename completion
+export FIGNORE=".dll:.cpl"
 
 # Append history
 #shopt -s histappend
 #PROMPT_COMMAND="history -a;$PROMPT_COMMAND"
 
-# Ignore list for filename completion
-export FIGNORE=".dll:.cpl"
+# Set PATH
+export PATH="/usr/sbin:~/bin:$PATH:."
 
 # Variables
+export TERM="xterm-256color"
 export DISPLAY="localhost:0.0"
 export EDITOR="nano"
 export LANG="en_GB"
 export LESS="-iRM"
 export LYNX_CFG="~/.lynx/lynx.cfg"
-export PATH="/usr/sbin:~/bin:$PATH:."
 export TZ="Europe/Oslo"
 
-# Aliases
-alias bb="ssh -t tty.sdf.org bboard"
-alias cd..="cd .."
-alias cls="printf '\ec'" # Clear screen+scrollback
+# ALIASES
+alias cls="clear"
+alias ls="ls --color=auto --group-directories-first"
+alias ll="ls -l"
+alias la="ls -la"
+alias dir="ls -l"
+alias rm="rm -i"
+alias mv="mv -i"
 alias cp="cp -i"
+alias cd..="cd .."
+alias grep="grep --color"
+alias keychaininit="eval \$(keychain --eval)"
+alias shn="pb -u"
+alias bb="ssh -t tty.sdf.org bboard"
+
+# CYGWIN
+alias start="cygstart"
 alias cyg-get="/e/Install/Cygwin/setup-x86_64.exe -qn -P"
 alias cyg-update="/e/Install/Cygwin/setup-x86_64.exe -qng"
-alias del="rm -i"
-alias dir="ls -la"
+alias npp="cygstart /d/bin/Notepad++/notepad++.exe"
+alias sublime="cygstart /d/bin/Sublime/sublime_text.exe"
+alias sudo="elevate -k" "$@" # https://code.kliu.org/misc/elevate/
+
+# GIT ALIASES
 alias ga="git add -A"
 alias gc="git commit"
 alias gl='git log --oneline --all --graph --decorate --color'
 alias gh="git hist"
-alias grep="grep --color"
 alias gs="git status"
 alias gw="git whatchanged"
-alias keychaininit="eval \$(keychain --eval)"
-alias la="ls -la"
-alias ll="ls -l"
-alias ls="ls --color=auto --group-directories-first"
-alias mv="mv -i"
-alias npp="cygstart /d/bin/Notepad++/notepad++.exe"
-alias rm="rm -i"
-alias shn="pb -u"
-alias start="cygstart"
-alias sublime="cygstart /d/bin/Sublime/sublime_text.exe"
-alias sudo="elevate -k" "$@" # https://code.kliu.org/misc/elevate/
 
-# Git Prompt
+# GIT PROMPT
 source /usr/share/git-core/git-prompt.sh
+
+# PROMPT: [user]@[host] [path]
 export PS1='\n\[\033[32m\]\u@\h \[\033[33m\w\033[0m\]$(__git_ps1 " (%s)")\n\$ '
 
 # Dircolors