Cleaned code, resolved spawn offset